Local: MyCom
Remote: Github

requests merge

upstream

upstream/main

  • fetch upstream
  • push

origin

Attention

충돌시 해결하기

Attention

충돌시 해결하기

main

  • checkout dev
  • stash
  • merge main
  • stash pop
  • checkout dev
  • merge main
Attention

충돌시 해결하기

  • checkout main
  • fetch upstream
  • merge dev
  • work
  • add
  • commit

dev

Question

dev에
변경 사항이 없는가

  • checkout main
  • merge upstream/main
pull requests
Yes
No
Interactive Graph
Table Of Contents
upstream
upstream/main
origin
main
dev